feat: Allow for configuration of `foldlevel` similar to Emacs Orgmode #615

PriceHiller · 2023-09-25T00:01:11Z

Summary

This PR permits configuration of the default fold level via the setup variable org_startup_folded.

This PR fixes the issues identified in Set Default Fold Level #614 as a user can now better modify the fold level used by Orgmode
This PR also solves issues with nvim-ufo integration (Compatibility with nvim-ufo #599) to a certain degree
- It "solves" the issue for nvim-ufo users (such as I) by permitting them to inherit their vim.opt.foldlevel instead of using Orgmode's provided fold level. This makes Orgmode play nice with nvim-ufo. My earlier problems with fillchars cannot be reproduced at this time, so I consider it a non-issue.
Wrote documentation to the DOCS.md file for the new option. As a note I have not written new documentation to the Orgmode help file. I noticed that it appeared autogenerated so I held off on that until I get some confirmation.

Notes

This PR introduced the new configuration variable as org_startup_folded with a default value of overview.
The org_startup_folded mirrors the values and usage from Emacs equivalent with the same values for configuration
This new configuration option doesn't play nice with users who lazy load on the Filetype event as the foldlevel is set upon that event matching for org file types.
- A way to fix that is to add a line in their config vim.cmd.edit() after Neorg's initial load which will reload the file and retrigger the Filetype event permitting the event to work as anticipated.
I had to pass the Orgmode config around in the lua/orgmode/init.lua file such that I could access the value of config.org_startup_folded and set the foldlevel accordingly.
This PR conditionally sets the foldlevel value with logic embedded directly into the setup_autocmds FileType autocmd. If you dislike that, please do guide me as to where that logic should be placed.
I created an inline type for the org_startup_folded variable in the DefaultConfig. This seems to be the only place within the DefaultConfig where that is done. If this is not desired I can readily rebase and remove the annotation.

A Recommendation

If Nvim Orgmode isn't deadset on being a 100% spec accurate implementation of Orgmode (which I suspect it is attempting to be), I would recommend rejecting this PR in favor of using a more Vim-centric way of setting the foldlevel.

That is, don't even set the foldlevel, make the user set it themselves. If they want a different foldlevel for only org files then they can use an autocmd or a ftplugin located in their config at after/ftplugin/org.lua.

On the other hand, if Nvim Orgmode is deadset on being a 100% compliant implementation of Orgmode, then this PR will bring the implementation closer to the spec.

Fin.

Feel free to provide critique and advice, I'm certainly inexperienced in working with Nvim Orgmode's code base, this PR marks the first time I have ever done so. Any thoughts you have are very much desired 😃.

Closes #614
Only partially resolves #599, for a tighter integration we may want to autodetect nvim-ufo and set the foldlevel accordingly.

PriceHiller · 2023-09-25T00:03:49Z

As a note it appears github will try to autoclose #599 on the acceptance of this PR, I recommend against that unless you believe this is a sufficient solution. A tighter integration may be desired, read the last bit of the PR for an idea 😉.

orhnk · 2023-09-25T00:47:57Z

Why not just have a depth variable?

With this approach you can:

require("orgmode").setup {
    fold = {
        -- depth = 1, --> custom depth
        depth = vim.o.foldlevel, --> respect the options
        -- Other fold options ... --
    }
}

PriceHiller · 2023-09-25T01:07:51Z

Sure, that'd work. I was trying to be compliant with Emacs orgmode, I'm unsure as to how much Nvim Orgmode intends to mirror it.

At that point though, why even support a depth variable? We get that for free via vim.opt.foldlevel if they set it and a user can use after/ftplugin/org.lua if they need a custom depth for only org files or an autocmd.

kristijanhusak

Thanks for the PR! Code looks ok, but I would like it to live on the config class and called in the ftplugin/org.vim.

kristijanhusak · 2023-09-25T08:44:46Z

lua/orgmode/init.lua

+      elseif config.org_startup_folded == 'showeverything' then
+        vim.opt_local.foldlevel = 99
+      elseif config.org_startup_folded == 'inherit' then
+        vim.opt_local.foldlevel = vim.opt.foldlevel:get()


I don't think we need this. It should inherit it automatically. We just need to not do anything in case of inherit value.

Yeah, good point! I will remove that. I'll get to this in a few hours, have a few things I gotta knock out today.

Done as part of the refactor to place this in the config class. Take a look.

kristijanhusak · 2023-09-25T08:49:34Z

lua/orgmode/init.lua

Let's not change anything in this file but instead introduce a method on the config called setup_foldlevel() and call it in the ftplugin/org.vim as we do for the mappings here

orgmode/ftplugin/org.vim

Line 7 in 983fc95

lua require('orgmode.config'):setup_mappings('text_objects')

lua require('orgmode.config'):setup_foldlevel()

Can do, will get to this in a few hours when I get a sec.

Done, see the config class now.

kristijanhusak

It's much cleaner now, thanks!

We just need to fix the fallback to be set properly since it won't be correctly set.

kristijanhusak · 2023-09-26T09:10:56Z

lua/orgmode/config/init.lua

+    vim.opt_local.foldlevel = 99
+  elseif self.org_startup_folded ~= 'inherit' then
+    vim.notify("Invalid option passed for 'org_startup_folded'!", vim.log.levels.WARN)
+    self.org_startup_folded = 'overview'


Since config does not have __newindex metamethod, this will not be set in the correct place.
It should be self.opts.org_startup_folded = 'overview'.

For the warning message, please use utils.echo_warning since that's what we use for other warnings so it is consistent.

Gotcha, done now. Did not know that Orgmode had its own utilities for info/warn/error.

kristijanhusak

Looks good, thanks!

PriceHiller · 2023-09-26T13:14:43Z

@kristijanhusak

Hey would you like me to go mention this in the ufo issue thread? If you set the setting to inherit or showeverything this resolves the issues I had with ufo not playing nice. Seems to work fine now.

kristijanhusak · 2023-09-26T13:16:20Z

Sure, go ahead.

…nvim-orgmode#615)

kristijanhusak requested changes Sep 25, 2023

View reviewed changes

PriceHiller force-pushed the feat/foldlevel-configuration branch from d979d92 to 7b8a5be Compare September 25, 2023 16:32

feat: Allow for configuration of foldlevel similar to Emacs Orgmode

f878dfb

PriceHiller force-pushed the feat/foldlevel-configuration branch from 7b8a5be to f878dfb Compare September 25, 2023 16:36

PriceHiller requested a review from kristijanhusak September 25, 2023 16:54

kristijanhusak requested changes Sep 26, 2023

View reviewed changes

refactor: use correct methods to warn and set options for foldlevel conf

39a1d3c

PriceHiller requested a review from kristijanhusak September 26, 2023 12:52

kristijanhusak approved these changes Sep 26, 2023

View reviewed changes

kristijanhusak merged commit 5325a8e into nvim-orgmode:master Sep 26, 2023
4 checks passed

PriceHiller mentioned this pull request Sep 26, 2023

Compatibility with nvim-ufo #599

Closed

PriceHiller deleted the feat/foldlevel-configuration branch September 26, 2023 13:24

SlayerOfTheBad pushed a commit to SlayerOfTheBad/orgmode that referenced this pull request Aug 16, 2024

feat: Allow for configuration of foldlevel similar to Emacs Orgmode (…

2cf0bba

…nvim-orgmode#615)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Allow for configuration of `foldlevel` similar to Emacs Orgmode #615

feat: Allow for configuration of `foldlevel` similar to Emacs Orgmode #615

PriceHiller commented Sep 25, 2023 •

edited

Loading

PriceHiller commented Sep 25, 2023 •

edited

Loading

orhnk commented Sep 25, 2023 •

edited

Loading

PriceHiller commented Sep 25, 2023

kristijanhusak left a comment

kristijanhusak Sep 25, 2023

PriceHiller Sep 25, 2023

PriceHiller Sep 25, 2023

kristijanhusak Sep 25, 2023

PriceHiller Sep 25, 2023

PriceHiller Sep 25, 2023

kristijanhusak left a comment

kristijanhusak Sep 26, 2023

PriceHiller Sep 26, 2023

kristijanhusak left a comment

PriceHiller commented Sep 26, 2023

kristijanhusak commented Sep 26, 2023

feat: Allow for configuration of foldlevel similar to Emacs Orgmode #615

feat: Allow for configuration of foldlevel similar to Emacs Orgmode #615

Conversation

PriceHiller commented Sep 25, 2023 • edited Loading

Summary

Notes

A Recommendation

Fin.

PriceHiller commented Sep 25, 2023 • edited Loading

orhnk commented Sep 25, 2023 • edited Loading

PriceHiller commented Sep 25, 2023

kristijanhusak left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kristijanhusak left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kristijanhusak left a comment

Choose a reason for hiding this comment

PriceHiller commented Sep 26, 2023

kristijanhusak commented Sep 26, 2023

feat: Allow for configuration of `foldlevel` similar to Emacs Orgmode #615

feat: Allow for configuration of `foldlevel` similar to Emacs Orgmode #615

PriceHiller commented Sep 25, 2023 •

edited

Loading

PriceHiller commented Sep 25, 2023 •

edited

Loading

orhnk commented Sep 25, 2023 •

edited

Loading